From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 27 May 2017 03:03:11 +0000 (+0200)
Subject: tests: Adjust test runner
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~318
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=73cffb3c7f9a27e7e4af7befb415337ecfbcf077;p=gnome-shell.git

tests: Adjust test runner

The script currently assumes that srcdir is relative to builddir,
which is not the case for build directories outside the source tree
like the one used by jhbuild.
While we could get fancy and prepend the builddir if srcdir is relative,
there's nothing wrong with a relative path as we cd into the builddir
before evaluating srcdir.

https://bugzilla.gnome.org/show_bug.cgi?id=783206
---

diff --git a/tests/run-test.sh.in b/tests/run-test.sh.in
index d8f5a9bbe..f55d96656 100755
--- a/tests/run-test.sh.in
+++ b/tests/run-test.sh.in
@@ -27,11 +27,11 @@ done
 
 builddir=`dirname $0`
 builddir=`cd $builddir && pwd`
-srcdir=$builddir/@srcdir@
+srcdir=@srcdir@
 srcdir=`cd $srcdir && pwd`
 
 GI_TYPELIB_PATH="$GI_TYPELIB_PATH${GI_TYPELIB_PATH:+:}@MUTTER_TYPELIB_DIR@:$builddir/../src:$builddir/../src/gvc"
-GJS_PATH="$srcdir:$srcdir/../js"
+GJS_PATH="$srcdir:$srcdir/../js:$builddir/../js"
 GJS_DEBUG_OUTPUT=stderr
 $verbose || GJS_DEBUG_TOPICS="JS ERROR;JS LOG"
 GNOME_SHELL_TESTSDIR="$srcdir/"